Kill stray conflict line.

diff --git a/ChangeLog b/ChangeLog
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e3218278db38948b9dfdc36ef46d8276254be143..a5427d52f5327046e3d603bf87610d752a733070 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -55,7 +55,6 @@ Wed Nov 15 16:02:20 2000  Owen Taylor  <otaylor@redhat.com>
 
 2000-11-15  Havoc Pennington  <hp@redhat.com>
 
->>>>>>> 1.1532
        * gtk/gtktextview.c (changed_handler): offset redraw rect by
        xoffset in addition to yoffset, so horizontal scrolling doesn't
        break redraws